Corrected conversion bugs.