Fix for the duplicator; can't use Clone