T1002101 auto breaking comments

This is an issue that bothers me for months and now I finally fount the time to fix it. It is a good feeling fixing the software you work everyday with. :D