Final fix for 3G SOD2