Make sure clusters are where the Cues element actually says they are. Change-Id: Ib2a4642d3bf6079d5f3985c30eeefc3b20503eaa