API / non-API Call Distinction Bugfix