Fix Issue #6.