Don't add guid unconditionally