Issue #500 completed.