Another fix for FF