Fixes #412. I think.