Close GH-479: Oops, open PR again. Fixes #454