Fixed possible issue with UUIDs.