SPOI-3595 #comment Correct the clone implementation