Fixes #551