Fixed another bug on cluster