Issue 6129 clustering issue