Issue #445 completed