Fixed back button problem