Made the API error free!