Fix for incorrect handling of multi-line comments