#4748-9: fix link creation