Fixing back button issue