Fixes gh-24969

Comment From: onobc

@snicoll all comments addressed.

Comment From: snicoll

Thanks for the follow-up and for yet another great contribution Chris.