Learning how to revert... whoops

Revert "Revert "Fixed UUID string issue""

This reverts commit 9fb36e91b1b75e3bbea86f9eb654b60419cca127.