Fixed Issue #976

Fixed Issue #976