Issue #1 - fix more.