Fixed bugs with 1st fir 6 pcs