Don't create the option_name twice. (#334519, Chris Wilson)