Fix demo scenario could be stalled