Bug Fix: Link not inserted properly