Fix some bug of last commit