ticket:90 fix navigation bug