Bug fix, navigation switch crash