fix to handle multi-line comments properly