fix error in nav with ob_clean. Fixes #2921. Fixes #2964
Merge pull request #2990 from james2doyle/2.2/nav-ob-clean-fix

2.2/nav ob clean fix. Fixes #2921 and Fixes #2964