fix message -> collection