Fix bug with comments