Fix removed API