Bug with back-navigation fixed