Fixes #980