Fixed to be able to properly run from GAE