Fixes #4621

Putting this "diction" branch to use,I guess.