Fix: some struct def issue