Fix to support interCFG.