API ROUTER fix