Fixed bug navigation