Comments are now gathered correctly