Preserve option name