Fixes #547