Fixes #956