Fixes #947