Fixing clone operations [ci skip]