0816 fix minor error, some bugs still lead to stall