Properly fix signal issue

Change-Id: Ic4deae7b2a5f96befa5b98f3122eb23da17a6cac