Temporary fix for the debugger for the changes introduced in the previous commit