Fix Issue #825