Fixing an infinite loop wrt uuid