Fix to enable the calbacks

Fix problem with callbacks