fixed small mapping problems