Get classification to work correctly
Allow through v1.3