Added real way to fix linking