Resolved the bug that used to happen when we were using the GPS.