Fixes collection only being set by first message