Thoughts for #3408

Looking for thoughts on a fixing #3408