Issue #892 fixed