Fix mistake (starting fresh)

Change-Id: I8df1e003d74feae88d0521ad9297231f0f402226
Properly fix signal issue

Change-Id: Ic4deae7b2a5f96befa5b98f3122eb23da17a6cac