Add the PC mapping issue at SW