fixes #960