bugfix each