Fix #1682

Bugs in the debugger are friggin' stupid! This one is stupid no more.