Fix the conversions, now it passes all the tests.