Fixes #961