Fix Issue #1.