Fix for new Callback API