Exporting env var fix

Please review...