Issue #764 fixed