Make sure collections are correctly hydrated