Fixing API's output