WCM-242 fix guid