[master] Fix bug on API