Fix location again