fix link creation issues