Fixed #753 for reals, I hopes