Fixes #978