Update to address bug with GAE