Fixed signal handling