Fixes #985