Issue #324 completed