Fix bad split of ENV vars