Fix beams attaching and limit the angles