Fixed enable callbacks