fix mapping bug