Fix for gps crash