fixed navigation issue