Fixed liveness issue