Fix ElectronBeam for legacy targets