Fix guid lookup