fix duplicate mapping bug