Fixes #489