Fix converstion bug