MT#7335 Fix duplicate variable 'i' for both a struct and an int variable

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713662