Issue #807 fixed