Fix to enable the calbacks