NVMe fix