Fixed bug in navigation of hanging on exit