fixing fuxked api