Fixes #968