Issue #605