Guid generation fixed