Fix default $oldOpts from 09cbebb224