This should fix the nesting issue within structs.