add back API fixs