Fix for navigation glitches