Issue #864 fixed