tonight_map fixed