Applied fix for UUID values as parameters