Correction, committed wrong back button handler code while trying to find fix, problem still exists