Non-compliant data fix
* #1001