BroadCast Wait should now finally be fixed..