Fix cluster running