Fix signal handler

Change-Id: I1d73518aeb3e7ebc8d519e9b115141b889c3d07e