Fixed signal trapping issue