Fix Issue #71