fixes #680