ClusterBufferCue bug - workaround fix