Fix clone bug