Fix GPX (again)