Fix bug on waiting for an initial GPS fix