fix issue 6682