Fix Issue #21.