realy fix comments