Issue 810

Issue #810