Fixed for new specs (quarter map)