Fix #53 for reals this time