Fix step towards a new Option system! [ci skip]