fix collections in context