Fix location columns