Issue #587 fixed