fixed #32 - UUID is created in during the call