try to fix back button issues
merge fix for back button