Fixed bug where UUID was incorrect