Bug fix in Struct