fix for legacy clients, check for uuid