Fixes #983