Fixed part of #2190
Merge pull request #2193 from N3X15/beams

Fixed half of beamwalking