Resolved navigation issue