Fix issue #1383

Fix issue #1383