Fix #2269 - clone options before modifying