Fix issue caused by allowing spaces in env variables