Change to work for Google's App Engine