Fix "bad caps" part 2