finally fixed a mapping bug