Fix for kill signal handler