Fix bug related to ff being active