Issue #762 fixed