Corrected env-vars-export behaviour