Hi Khaled, Since Peter is not responding, what do you think of this patch? Should I go ahead and commit this to TeXLive repository? People had been using it for a few days with various CID-keyed fonts and haven't reported any more issue. - Jiang