Fixes #942