Fix for issues with back-button.