fixing WG compability