fixed api problems