Fixes #578