fix some corner cases again