Fix TransformerWithPC with matches