Fixed signal-setting bug