Needed another fix for back button crash