Fix: comments parsing