missed merge from fi_bit fix branch