Fix bug when commenting