Fixed Issue #867