Fixing conversion problem