Fix call to NewGuid