Fix bug of older clusters