Fix debugger bug after merging matiec repositories