Fix UATNBFBL0001 - 1st Revert