T/S Edit Comments fix