Options fix
Options fix
Merge branch 'hotfix/options_values'