Fixed API (again)