possible fix for uuids support