Fix Issue #32