Fixed issue of still missing uuids