Fix location ordering