Another fix in changed API