Fix Issue #35