fixed the back-button bug (for real this time)