Fix everything, no more double-counting.