Linking fix