improve some case