actually fix ff bug