[api] Refactor fix