Fix Issue #29