fixing the fact that env are passed by reference not copied, not an entire fix