Fixes #501.