Improvement to OdS cloning logic.