Fixed surveillance restart after collapse