Fixes #989