fix complete failure to handle comments

Fairly simple change; you've an alternative outstanding pull request that refactors it to within an inch of its life.

I don't really mind which one you merge just PLEASE can we have a fixed version of some sort :D