Fixes #947, which fixes #945