Beam bugfix