removed ff workaround