Fixes #3777

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3784 from Mloc/beamfix

Beamfix