fixed mapping laoding issue