API implemetation correction