fixing ff bug from #1