Issue996

Issue #996