API update to fix #4479