fixes #815