Recommit on fixing map calcs