Fixes #402; handles UUID separately instead of calling .next