fix WB/EX forward bug