Fix issue #4178