Fix for when I move out the API.