ENV variables fixed