New fix for back button exit