fix issue #6209