fixed fields parsing bug