Fix saving locations