Fixing clone issue