First attempt to correct Issue #9