Fixes #3082 : Cloning directive now clones better than ever