fixed and api changed