Fixed RateParser and ZoneParser