Fix API again