Fix for tag cloning