Fix some bug but still have a little problem about time out