Fix the classifier check to be more accurate