Note: Novalink fix.