andrdoi api fixed