Emi - Fix for UATNBNXR035

Unrelated CFF to related CFF.