fix issue #8102