Improve GPS button response #661