Minor fix to support primitive structure.