Resolve ENV variables problem