Fixes #494.