As a follow-up to my previous patch.

`~Eric