fix doubling issue