Bug Fix in NavWindow