Final intel optimization fix