Follow up to 26afd76 to fix Elemental Shield. (bugreport:8872)