* Environvariables are now correctly passed