Issue #364 completed.