Transitions 2.0 callbacks may end out of context

I removed the transition in the interest of time.  When I come back to it, I will test it further and provide a sample. Thank you for confirming the fix