Simplify a little bit the signal handler