Issue #9 handled.