Fixed the comment handeling issue.