close #3425 and close #3421