Fix issue #1558