Fixed UUID bug