Fixed bug with redefinition of structs error