#2588 fix bug