That's kind of the crux of the fix, if we just have that callback, I think even in the same place, that should still enable the fix