Fix parsing of fields