added a hack that prevents the errors caused by MCL beacons