Fix issue #24

Fix issue #24:
Some Comment Tags Break on Format