Fix Issue #12.