fixed annoying navigation issue