fixes #601