TEMP debugger fix