Non-compliant data fix #2906