Fix options object pass-by-reference; need to clone instead