Check aliveness only once
Fixed diagrams