Fixed naviagation issue