Fixing Linking Issue