Fixed guid issue