fixed non double count