the modenv fix from before :P