Fixes #620