Uniquetid overflow fix