Fixed bug with uuid