Fix Issue #7.