fixed api 2