WARNING: UNTESTED FIX

I can't test it as I have no GPS and it's broken.