added fix for back button issues