[FIX] adapt to API changes