Fixing bug caused by UUID not being generated properly.