-Codechange: use signal only as a fallback