Fixed UUID gen bug