Fix for ElectronBeam commit