Fixed clone bug