improved validation, correct enabled setting
1.2.0