fix some more cases