Added suggestion from PVince #r14703937