Fixed classifier code