make change acording to tengqm's comment and rebase to 24675 change against tengqm's second round comment