Properly catch clone too