Fixed Issue #967

Fixed Issue #967