#1137 - added fix on navs not working properly