Fix classifier handling