Fixed XCRI12Handler