Fix Issue #62