Fixed mapping bug.