More aggressive IPC fix.