Fixing "clone" feature