fixes #811