attempting to fix ff bug
Merge branch 'dev'