Properly validate comments (fixes #1)