Fixing issue with eviron