Fix FIRM construction for assignment