fix retry wait and broadcast handling