fixed two problems, where uuid was generated multiple times