Bugfix for ff