BUGFIX: add quoting for env vars