Fix for UATNBNXR047 Part 1