Bug fix in clone