fix uuid assignment issue