Fix issue with ID as uuid