Fix GPX (again & repetita)