Hopefully fix counting issue?