MT#6751 force more intrusive check