fix gps service handling