Fixed double counting logic