8.13 fix bug