Fix Issue #34