handle comments fixes #2