API refactor fix