Classifier fix