Fix Issue #21