Issue #871 fixed