Ugly fix for some comments parsing