fixes #818