Issue #891 fixed