Fix comment bug
Fix comment element bug