Fixed bugs with clones