fix comments flow