Fixed issue with API