Fix options to not overwrite existing value for an option