fixed mapBetween