Navigation reload-bug fix