Fix for UATNBNXR0036