Corrected navigation problem