Fix one more case of computing the return EPC after the registers have