Added safety in the navigation