Fixed conversion bug