Fix Issue #13.