solution navbafr fixed