Fixes #994