Fix Issue #22.