Change options initialization to best form