better cosmetic and fix issue #4037