Unbreak the API