Issue #816 fixed