#2225 fix bug