Non-compliant data fix #2906
Merge pull request #2910 from acabunoc/bugfix-classification

Non-compliant data fix #2906