Fix an error about Struct handling