Fix of guid update