reworked accordingly to github version of gaeenv