comments bugfix