Duplicate of #1099 -- but even so, I'd like to see something along the lines of the patch in #1099 go in, since it's an easy, small fix and it's been three months since #1099 was closed without the "proper" fix materializing.