[Fixed] Stability issues in cloning proccess

Change-Id: Ifd3e8c08e12c677c931e3eabd2bfd78d1292274a