api fix regarding to server changes