Issue 610

Issue #610