Fix ElectronBeam issue