Fixed activity_map issue