sc: really fix incomplete CollectedStateMessages

The last commit doesn't seem to work