Fixes #573