fix clustering issue (NPE)