Fix Navigator Bug