close #29
Disabled options broken