safety improvement to RT#9947