Fix mapping bug