Fixed back button bug