Critical fix due to API change