Handle Eq/TotalEq properly

Or at least I think this is properly...