Fix the handling of beacons in the client