Bug fix for broken navigation calls