Fixed parse functions