Fix Issue #713