Fixed a bug preventing double underscores in environment variables