Fixes clones when the destination doesn't exist

This should eliminate the need for most of #1