Fix convert as well