Fix BEAM finder