Fix issue which disables clustering unintentionally.

Fix issue which disables clustering unintentionally. #5023