Fixed issue with multiple links