FIX: Crash on removing signs/signals in some cases