Fix for UATNBFBL012 - 1st Revert