Fix options
Merge pull request #2327 from elinw/optionsfix

Fix options. Thanks Elin.