id_mapping bug fixed