Fix for existing links