Self-broadcasting bug fixed