#785 - ensure options are deep-copied