Fix for ID generation as UUIDs