didn't need this, but more future-proof, RT#5083