another fix for ff issue