Fix for new appspot.com api