Fixed the API somehow