Fixed false negatives for structs