Fixed enabled/disabled mixup