Fix issue #5268