finally fixed navigation