Fixes #494