fixed mapping bug