Fix for UATNBFBL021

CFF Form