fix for support of uuid