Fix conversion bug