Bugfix for options parsing