Added escaping signals.
Self-review plus fix.