issue  #2377:Adjust some function places.