update some case, for more stability