fix some cases.