Fixed bug when classifier uses an underscore