Fix clone to not corrupt data