Fix bug with guid processing