bugfix each class