Fixed so callbacks work again, hopefully without breaking anything.
2 files changed