better handle of signal marcro conflict