Fix Issue #22