Fix for all of the APIs not working (sorry @cvan)