More fix to prevent from reloading on navigation.