Fixed Beacon issue