I don't know if this counts as solving your troubles, but this is more important to you, right?