Fix data count processing
Merge