Fixes #482