fix last 2 bugs found by 豚豚 and 东风