Fix IPCR issue