Fix issue #1369