Issue/1751

Fix issue #1751