One more fix due to changed collection API