Fix FIRs