Trying to fix linking bug