Fixed Navigational issue