Fix for UATNBNXR006 - 1st Revert