Issue #573 completed