Fix on comments