fixed errors after updating GWT/GAE (uggh)
restored code lost after update