Fix for duplicate links