Fixing conflicting ENV