Card #100 - fix for links when cloning