[#1734] Fix the linking