potentially fixes #823