Issue #586 fixed