Bugfix in option handling