fix double counting