Fixed a problem with merge of options.