Fixes #470.