Minor optimization for beacons