fix issue 6770