Fix conversion