Corrected convert functions