Issue #794

Change for #794