Fix #8487: Debugger confuses variables