Fix no signal

Change-Id: Ic3fda89d29e5d0481b0ec26441f730efe0fa4f74
Change some code to try

Change-Id: I0915e4a3c16be87869d1018c7fdf1483cd81a0ee