Fix enabled/disabled condition. Closes #2