fixed mapping problems