Map endings in map fixed