adopt to API changes