Awd2.1 fix for ShadowMethods