Another nested struct fix.