CARE #13: Fixed map issue