Fix API (again)