Fix issue #2356