fixing enabling/disabling