More fiddling to get the conversions right