Re #7452 tweak beam finder