more struct_stack fixing