add AIO Optimization fix up