- fixes #822