Fix issue with API