fix for back buttons working consistently