NAV bug fixing

NAV bug fixing