Fix for UATNBNXR006 – 2nd Reverted