Fix support for recursive structs