Fixes #601