fixed fi bug