Fix guid bug