Don't remove whitespaces (see below) in environment variables (or maybe create option)

" test test2" -> "test test2"