Fixes #609.