Fix Dialog and guid