Fixing the state collection bug that has been outstanding for 2 months.
Merge remote-tracking branch 'origin/StateCollectionIncorrect' into lb