Repair for NF 2.1 RC2