Fix Issue #6992