Fix Issue #113