Puppet Repair