fix for no uuid's