Issue #824 fixed