Fix the cluster component.

Fixes #5950