Minor fix for debug mode