Issue #821 fixed