Fixed the issue with UUID.