Issue #580 fixed