broadcast issue fixed