BK-1664 #2 Naivgation issue.