Fixed conversion issue