Fix for beacons