Add NVP FIO workaround