Fix that API