Clone options; fix