modified: connect_signals, check correct handler