another struct copy back fix.