Fixed Uniquecount issue