fixed custom_mapping bug