Replacing fenvs with Alberto version (see GMAP)