Fixes #454.