fix some condition