Fix to handle properly 'catch signal SIGINT' and SIGTRAP