mapping bug fix