optimize MP6 compatibility