Quick workaround for back button bug