fix for mapping bug