Field parsing fix