fix signals managements