TES-1 #resolve #comment full fix