Trying to fix the match error on cluster building.