Issue #377 completed