Issue #823 fixed