Fix Class:clone