CallbackWrapper bugfix