Temp fix on multiple links bug