G18/MX2: WIFI Fix, based on 03bf2fc4fc9087a9300906a5c5df15ea06df0ad4