Fixing environment variables issue (new vars are appended)