Rework false collapse protection