Attempt to fix linking